From: Felix Fietkau <nbd@openwrt.org>
Date: Sun, 23 Dec 2007 21:36:03 +0000 (+0000)
Subject: fix gnutls staging
X-Git-Url: http://git.openwrt.org/%22https:/collectd.org//%22/%22https:/collectd.org/%22?a=commitdiff_plain;h=e2fbd6c468601d50d31d4c531f2734b113738018;p=openwrt%2Fsvn-archive%2Fpackages.git

fix gnutls staging

SVN-Revision: 9882
---

diff --git a/libs/gnutls/Makefile b/libs/gnutls/Makefile
index 1941d95d2..ea68dfc5d 100644
--- a/libs/gnutls/Makefile
+++ b/libs/gnutls/Makefile
@@ -145,13 +145,13 @@ endef
 
 define Build/Compile
 	$(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_ARGS) all
-	$(call libtool_fixup_libdir,$(PKG_INSTALL_DIR))
 	$(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_ARGS) DESTDIR="$(PKG_INSTALL_DIR)" install
+	$(call libtool_fixup_libdir,$(PKG_INSTALL_DIR))
 endef
 
 define Build/InstallDev
 	mkdir -p $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/libgnutls{,-extra}-config $(1)/usr/bin/
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/libgnutls{,-extra}-config $(2)/bin/
 	mkdir -p $(1)/usr/include
 	$(CP) $(PKG_INSTALL_DIR)/usr/include/gnutls $(1)/usr/include/
 	mkdir -p $(1)/usr/lib
@@ -161,10 +161,10 @@ define Build/InstallDev
 endef
 
 define Build/UninstallDev
-	rm -rf	$(STAGING_DIR)/usr/bin/libgnutls{,-extra}-config \
-		$(STAGING_DIR)/usr/include/gnutls \
-		$(STAGING_DIR)/usr/lib/libgnutls{,-extra,-openssl}.{a,so*} \
-		$(STAGING_DIR)/usr/lib/pkgconfig/gnutls{,-extra}.pc
+	rm -rf $(2)/usr/bin/libgnutls{,-extra}-config \
+		$(1)/usr/include/gnutls \
+		$(1)/usr/lib/libgnutls{,-extra,-openssl}.{a,so*} \
+		$(1)/usr/lib/pkgconfig/gnutls{,-extra}.pc
 endef